core: Drop old GLIB_CHECK_VERSION(2.32) bits

We hard require 2.34 now; if it doesn't exist on the system, that's
what embedded dependencies are for.

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 7555be7d628cf821853230f6b8409b7f2f278ff7..bbd25dbe86721f5876cfb067efa8bd899bafcd51 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -54,11 +54,7 @@ struct OstreeRepo {
   GFile *remote_cache_dir;
   GFile *config_file;
 
-#if GLIB_CHECK_VERSION(2,32,0) && !defined(OSTREE_GLIB_TARGET_MIN)
   GMutex cache_lock;
-#else
-  GMutex *cache_lock;
-#endif
   GPtrArray *cached_meta_indexes;
   GPtrArray *cached_content_indexes;
 

diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c
index 973dbf16eb98d9ebc9c4cf52c90dbc9a43e0a016..21349aeaebc7f7bd753b7db4cf0cc9d1a3857a16 100644 (file)
--- a/src/libotutil/ot-variant-utils.c
+++ b/src/libotutil/ot-variant-utils.c
@@ -92,13 +92,7 @@ ot_util_variant_save (GFile *dest,
 GVariant *
 ot_util_variant_take_ref (GVariant *variant)
 {
-#if GLIB_CHECK_VERSION(2,32,0) && !defined(OSTREE_GLIB_TARGET_MIN)
   return g_variant_take_ref (variant);
-#else
-  if (g_variant_is_floating (variant))
-    return g_variant_ref_sink (variant);
-  return variant;
-#endif
 }
 
 /**